From: Kenichi Handa <handa@m17n.org>
Date: Tue, 3 Mar 2009 01:57:22 +0000 (+0000)
Subject: (select-safe-coding-system): If cdr
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~1451
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=d73e2cde058b0430764ae27465ed57a087d97629;p=emacs.git

(select-safe-coding-system): If cdr
part of buffer-file-coding-system-explicit is set, ignore
default-buffer-file-coding-system and the most preferred coding
system.
---

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 451ac39cbfa..feed9870a8e 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -930,28 +930,30 @@ It is highly recommended to fix it before writing to a file."
 		      (append default-coding-system
 			      (list (cons buffer-file-coding-system base)))))))
 
-      ;; If default-buffer-file-coding-system is not nil nor undecided,
-      ;; append it to the defaults.
-      (if default-buffer-file-coding-system
-	  (let ((base (coding-system-base default-buffer-file-coding-system)))
-	    (or (eq base 'undecided)
-		(rassq base default-coding-system)
-		(setq default-coding-system
-		      (append default-coding-system
-			      (list (cons default-buffer-file-coding-system
-					  base)))))))
-
-      ;; If the most preferred coding system has the property mime-charset,
-      ;; append it to the defaults.
-      (let ((preferred (coding-system-priority-list t))
-	    base)
-	(and (coding-system-p preferred)
-	     (setq base (coding-system-base preferred))
-	     (coding-system-get preferred :mime-charset)
-	     (not (rassq base default-coding-system))
-	     (setq default-coding-system
-		   (append default-coding-system
-			   (list (cons preferred base)))))))
+      (unless (and buffer-file-coding-system-explicit
+		   (cdr buffer-file-coding-system-explicit))
+	;; If default-buffer-file-coding-system is not nil nor undecided,
+	;; append it to the defaults.
+	(if default-buffer-file-coding-system
+	    (let ((base (coding-system-base default-buffer-file-coding-system)))
+	      (or (eq base 'undecided)
+		  (rassq base default-coding-system)
+		  (setq default-coding-system
+			(append default-coding-system
+				(list (cons default-buffer-file-coding-system
+					    base)))))))
+
+	;; If the most preferred coding system has the property mime-charset,
+	;; append it to the defaults.
+	(let ((preferred (coding-system-priority-list t))
+	      base)
+	  (and (coding-system-p preferred)
+	       (setq base (coding-system-base preferred))
+	       (coding-system-get preferred :mime-charset)
+	       (not (rassq base default-coding-system))
+	       (setq default-coding-system
+		     (append default-coding-system
+			     (list (cons preferred base))))))))
 
     (if select-safe-coding-system-accept-default-p
 	(setq accept-default-p select-safe-coding-system-accept-default-p))